Don't return values from void functions.

2006-05-22  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkprinter.c (_gtk_printer_prepare_for_print)
	(_gtk_printer_get_settings_from_options)
	(_gtk_printer_request_details): Don't return values from void
	functions.

	* gtk/gtkrecentchooserutils.c (delegate_unselect_uri): Don't
	return a value from a void function.

	* gtk/gtkfilesystem.c (gtk_file_system_cancel_operation): Don't
	return a value from a void function.  Also, don't put
	semicolons behind G_DEFINE_TYPE. (#342543)

diff --git a/ChangeLog b/ChangeLog
index 0b862265dfb3a61e4324f3e884a559c5a8dae245..5b618352087a3308457419e9179980f0810b6421 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2006-05-22  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkprinter.c (_gtk_printer_prepare_for_print) 
+       (_gtk_printer_get_settings_from_options) 
+       (_gtk_printer_request_details): Don't return values from void
+       functions.
+
+       * gtk/gtkrecentchooserutils.c (delegate_unselect_uri): Don't
+       return a value from a void function.
+
+       * gtk/gtkfilesystem.c (gtk_file_system_cancel_operation): Don't
+       return a value from a void function.  Also, don't put 
+       semicolons behind G_DEFINE_TYPE. (#342543)
+
        * gtk/gtkwidget.c (gtk_widget_class_init): Add docs
        for new style properties.  (#342535, Mart Raudsepp)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0b862265dfb3a61e4324f3e884a559c5a8dae245..5b618352087a3308457419e9179980f0810b6421 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,17 @@
 2006-05-22  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkprinter.c (_gtk_printer_prepare_for_print) 
+       (_gtk_printer_get_settings_from_options) 
+       (_gtk_printer_request_details): Don't return values from void
+       functions.
+
+       * gtk/gtkrecentchooserutils.c (delegate_unselect_uri): Don't
+       return a value from a void function.
+
+       * gtk/gtkfilesystem.c (gtk_file_system_cancel_operation): Don't
+       return a value from a void function.  Also, don't put 
+       semicolons behind G_DEFINE_TYPE. (#342543)
+
        * gtk/gtkwidget.c (gtk_widget_class_init): Add docs
        for new style properties.  (#342535, Mart Raudsepp)
 

diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index f2e48e7ba80f1ef7f36c56747f3babd358cbd90c..c7f965e23fd774fd1f531217bb1a10b1819a7cbc 100644 (file)
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -496,7 +496,7 @@ gtk_file_system_cancel_operation (GtkFileSystemHandle *handle)
 {
   g_return_if_fail (GTK_IS_FILE_SYSTEM_HANDLE (handle));
 
-  return GTK_FILE_SYSTEM_GET_IFACE (handle->file_system)->cancel_operation (handle);
+  GTK_FILE_SYSTEM_GET_IFACE (handle->file_system)->cancel_operation (handle);
 }
 
 /**
@@ -1245,7 +1245,7 @@ struct _GtkFileSystemModuleClass
   GTypeModuleClass parent_class;
 };
 
-G_DEFINE_TYPE (GtkFileSystemModule, _gtk_file_system_module, G_TYPE_TYPE_MODULE);
+G_DEFINE_TYPE (GtkFileSystemModule, _gtk_file_system_module, G_TYPE_TYPE_MODULE)
 #define GTK_TYPE_FILE_SYSTEM_MODULE       (_gtk_file_system_module_get_type ())
 #define GTK_FILE_SYSTEM_MODULE(module)   (G_TYPE_CHECK_INSTANCE_CAST ((module), GTK_TYPE_FILE_SYSTEM_MODULE, GtkFileSystemModule))
 

diff --git a/gtk/gtkprinter.c b/gtk/gtkprinter.c
index 3661f537e9c2035be621d6a03f6fac9b313c9c99..429d577b97fdc5999509dde1aaf1a6e24c7846d0 100644 (file)
--- a/gtk/gtkprinter.c
+++ b/gtk/gtkprinter.c
@@ -656,7 +656,7 @@ void
 _gtk_printer_request_details (GtkPrinter *printer)
 {
   GtkPrintBackendClass *backend_class = GTK_PRINT_BACKEND_GET_CLASS (printer->priv->backend);
-  return backend_class->printer_request_details (printer);
+  backend_class->printer_request_details (printer);
 }
 
 GtkPrinterOptionSet *
@@ -682,7 +682,7 @@ _gtk_printer_get_settings_from_options (GtkPrinter          *printer,
                                        GtkPrintSettings    *settings)
 {
   GtkPrintBackendClass *backend_class = GTK_PRINT_BACKEND_GET_CLASS (printer->priv->backend);
-  return backend_class->printer_get_settings_from_options (printer, options, settings);
+  backend_class->printer_get_settings_from_options (printer, options, settings);
 }
 
 void
@@ -692,7 +692,7 @@ _gtk_printer_prepare_for_print (GtkPrinter       *printer,
                                GtkPageSetup     *page_setup)
 {
   GtkPrintBackendClass *backend_class = GTK_PRINT_BACKEND_GET_CLASS (printer->priv->backend);
-  return backend_class->printer_prepare_for_print (printer, print_job, settings, page_setup);
+  backend_class->printer_prepare_for_print (printer, print_job, settings, page_setup);
 }
 
 cairo_surface_t *

diff --git a/gtk/gtkrecentchooserutils.c b/gtk/gtkrecentchooserutils.c
index 3f1cdb4c5e1b7148e4691dc78de654892b029a23..328b3bbb577645cf9b35e1f93ec8fc356335814a 100644 (file)
--- a/gtk/gtkrecentchooserutils.c
+++ b/gtk/gtkrecentchooserutils.c
@@ -226,7 +226,7 @@ static void
 delegate_unselect_uri (GtkRecentChooser *chooser,
                       const gchar      *uri)
 {
-  return gtk_recent_chooser_unselect_uri (get_delegate (chooser), uri);
+ gtk_recent_chooser_unselect_uri (get_delegate (chooser), uri);
 }
 
 static GList *